commit 273330a55d7cf457da6d7ba9829527a961c40bc0
author himajin100000 <himajin100000@gmail.com> Sat Jan 19 14:25:50 2019 +0900
committer Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tue Jan 22 12:00:37 2019 +0100
tree 0f3b7c77d0b3e0e28969067155211f7c3b0e0bc4
parent 35f4219155e7efa0eee231a886a0df8f7dc9c42e

Support AdoptOpenJDK

Change-Id: Idcfd542c6caede3d987e9b8219cf48114800daa5
Reviewed-on: https://gerrit.libreoffice.org/66634
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 61c4f96d6ae6a80370774e53287edb27cbce8067)
Reviewed-on: https://gerrit.libreoffice.org/66715
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>

jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml

diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
index c603575..b05b6c7 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
@@ -17,7 +17,7 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0">
  <updated>2012-07-12</updated>
  <updated>2019-01-19</updated>
  <vendorInfos>
    <vendor name="Oracle Corporation">
      <minVersion>1.7.0</minVersion>
@@ -31,5 +31,8 @@
    <vendor name="Free Software Foundation, Inc.">
      <minVersion>1.5.0</minVersion>
    </vendor>
    <vendor name="AdoptOpenJdk">
      <minVersion>1.8.0</minVersion>
    </vendor>
  </vendorInfos>
</javaSelection>

jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml

diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
index 969ed01..b008bb1 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
@@ -17,7 +17,7 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0">
  <updated>2013-05-02</updated>
  <updated>2019-01-19</updated>
  <vendorInfos>
    <vendor name="Sun Microsystems Inc.">
      <minVersion>1.5.0</minVersion>
@@ -40,5 +40,8 @@
    <vendor name="Azul Systems, Inc.">
      <minVersion>1.6.0</minVersion>
    </vendor>
    <vendor name="AdoptOpenJdk">
      <minVersion>1.8.0</minVersion>
    </vendor>
  </vendorInfos>
</javaSelection>

jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml

diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
index c241658..1fe7547 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
@@ -17,7 +17,7 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0">
  <updated>2013-04-09</updated>
  <updated>2019-01-19</updated>
  <vendorInfos>
    <vendor name="Oracle Corporation">
      <minVersion>1.7.0</minVersion>
@@ -31,5 +31,8 @@
    <vendor name="Azul Systems, Inc.">
      <minVersion>1.6.0</minVersion>
    </vendor>
    <vendor name="AdoptOpenJdk">
      <minVersion>1.8.0</minVersion>
    </vendor>
  </vendorInfos>
</javaSelection>

jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml

diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
index fb79c00..7771d81 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
@@ -17,7 +17,7 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0">
  <updated>2011-01-07</updated>
  <updated>2019-01-19</updated>
  <vendorInfos>
    <vendor name="Oracle Corporation">
      <minVersion>1.7.0</minVersion>
@@ -25,5 +25,8 @@
    <vendor name="Sun Microsystems Inc.">
      <minVersion>1.5.0</minVersion>
    </vendor>
    <vendor name="AdoptOpenJdk">
      <minVersion>1.8.0</minVersion>
    </vendor>
  </vendorInfos>
</javaSelection>

jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml

diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
index 0a37a4e..4298311 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
@@ -17,7 +17,7 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0">
  <updated>2013-05-02</updated>
  <updated>2019-01-19</updated>
  <vendorInfos>
    <vendor name="Oracle Corporation">
      <minVersion>1.6.0</minVersion>
@@ -31,5 +31,8 @@
    <vendor name="Azul Systems, Inc.">
      <minVersion>1.6.0</minVersion>
    </vendor>
    <vendor name="AdoptOpenJdk">
      <minVersion>1.8.0</minVersion>
    </vendor>
  </vendorInfos>
</javaSelection>

jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
index 608be15..b4818b1 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
@@ -42,6 +42,7 @@
#endif
    VENDOR_MAP_ENTRY("Sun Microsystems Inc.", SunInfo)
    VENDOR_MAP_ENTRY("Oracle Corporation", SunInfo)
    VENDOR_MAP_ENTRY("AdoptOpenJdk", SunInfo)
#ifndef MACOSX
    VENDOR_MAP_ENTRY("IBM Corporation", OtherInfo)
    VENDOR_MAP_ENTRY("Blackdown Java-Linux Team", OtherInfo)